Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 29 May 2011 21:37:48 +0000 (14:37 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 29 May 2011 21:37:48 +0000 (14:37 -0700)
commit53c3b36ed0058ee2a446c3c4837f866df1f163d7
tree565a0aa4ad86e29284bdfaf34a979cc7f6a6c422
parent7a0d135b114cc173dfd903b32dd26d35c16187eb
parent3bee715386499484f2196297cb0a0f3a05f91999
Merge from trunk.